ARM: fix error: conflicting types for 'setenv'

Also remove bogus comment.

Signed-off-by: Zhong hongbo <[email protected]>
Changed commit message
Signed-off-by: Wolfgang Denk <[email protected]>
Cc: Albert Aribaud <[email protected]>

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 3904027016e69bb31e6579b72f6133d74b8d89ee..e3fbb53d4da8b6e5fc83871a9ff66b2e5f6a5c45 100644 (file)
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -57,14 +57,6 @@ void dram_init_banksize (void);
 void   setup_serial_tag (struct tag **params);
 void   setup_revision_tag (struct tag **params);
 
-/* ------------------------------------------------------------ */
-/* Here is a list of some prototypes which are incompatible to */
-/* the U-Boot implementation                                   */
-/* To be fixed!                                                        */
-/* ------------------------------------------------------------ */
-/* common/cmd_nvedit.c */
-int    setenv          (char *, char *);
-
 /* cpu/.../interrupt.c */
 int    arch_interrupt_init     (void);
 void   reset_timer_masked      (void);